From e9f541dc5143062fc2ae521d239cd9067bf7e3e9 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Wed, 27 Oct 2010 14:30:07 +0900 Subject: [PATCH] Removed size_request from GtkMenuBar --- gtk/gtkmenubar.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index 8dab56b972..a28622a65f 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -68,6 +68,12 @@ static void gtk_menu_bar_get_property (GObject *object, GParamSpec *pspec); static void gtk_menu_bar_size_request (GtkWidget *widget, GtkRequisition *requisition); +static void gtk_menu_bar_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural); +static void gtk_menu_bar_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural); static void gtk_menu_bar_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static gint gtk_menu_bar_draw (GtkWidget *widget, @@ -98,7 +104,8 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class) gobject_class->get_property = gtk_menu_bar_get_property; gobject_class->set_property = gtk_menu_bar_set_property; - widget_class->size_request = gtk_menu_bar_size_request; + widget_class->get_preferred_width = gtk_menu_bar_get_preferred_width; + widget_class->get_preferred_height = gtk_menu_bar_get_preferred_height; widget_class->size_allocate = gtk_menu_bar_size_allocate; widget_class->draw = gtk_menu_bar_draw; widget_class->hierarchy_changed = gtk_menu_bar_hierarchy_changed; @@ -347,6 +354,30 @@ gtk_menu_bar_size_request (GtkWidget *widget, } } +static void +gtk_menu_bar_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + GtkRequisition requisition; + + gtk_menu_bar_size_request (widget, &requisition); + + *minimum = *natural = requisition.width; +} + +static void +gtk_menu_bar_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + GtkRequisition requisition; + + gtk_menu_bar_size_request (widget, &requisition); + + *minimum = *natural = requisition.height; +} + static void gtk_menu_bar_size_allocate (GtkWidget *widget, GtkAllocation *allocation) -- 2.30.2